Cleaned up warnings, still partially working