hey dave, youve seen by current little tank, its fairly simple.
the thing you need to think about is what you want to keep and design the tank around that (rather than have a tank and shove something in it that might not "fit")
the filter in the aquaone tanks is not ideal, my brother just setup one but he is chucking the filter and putting in a protein skimmer and he is beefing up the lights so that all is left it the tank and the light part (sort of).