Finally working. Cleaning up.