Done with the foundation! Now bug fixing.