Cleaned up a little, basic functionality working.