Water is now fish friendly, all the fish out of my holding tank have now gone in. 
 
Lighting is finished, nice metal halide during the day with a t8 timed to come on in the evening 
 
 Have now decided to go for a Malawi setup, plants don't work well with the background (hides too much of it)